Index: framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl
===================================================================
--- framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl	(revision 1590602)
+++ framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl	(working copy)
@@ -19,9 +19,9 @@
 
 <table cellspacing="0" class="basic-table hover-bar">
     <tr class="header-row">
-        <#assign firstRecord = records[0]?if_exists/>
+        <#assign firstRecord = records[0]!/>
         <#list columnNames as columnName>
-        <td<#if firstRecord?exists && firstRecord[columnName]?default("")?is_number> class="align-text"</#if>>
+        <td<#if firstRecord?? && firstRecord[columnName]?default("")?is_number> class="align-text"</#if>>
             ${columnName}
         </td>
         </#list>
Index: framework/common/webcommon/error.fo.ftl
===================================================================
--- framework/common/webcommon/error.fo.ftl	(revision 1590602)
+++ framework/common/webcommon/error.fo.ftl	(working copy)
@@ -54,7 +54,7 @@
                 <fo:table-body>
                     <fo:table-row>
                         <fo:table-cell>
-                        <#if logoImageUrl?exists>
+                        <#if logoImageUrl??>
                             <fo:block>
                                 <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/>
                             </fo:block>
@@ -71,7 +71,7 @@
                                         <fo:block font-weight="bold">${uiLabelMap.CommonUsername}</fo:block>
                                     </fo:list-item-label>
                                     <fo:list-item-body start-indent="body-start()">
-                                        <fo:block><#if userLogin?exists>${userLogin.userLoginId?if_exists}</#if></fo:block>
+                                        <fo:block><#if userLogin??>${userLogin.userLoginId!}</#if></fo:block>
                                     </fo:list-item-body>
                                 </fo:list-item>
                                 <fo:list-item>
@@ -79,7 +79,7 @@
                                         <fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block>
                                     </fo:list-item-label>
                                     <fo:list-item-body start-indent="body-start()">
-                                        <fo:block>${nowTimestamp?if_exists}</fo:block>
+                                        <fo:block>${nowTimestamp!}</fo:block>
                                     </fo:list-item-body>
                                 </fo:list-item>
                             </fo:list-block>
@@ -100,7 +100,7 @@
                 ${uiLabelMap.CommonFollowingErrorsOccurred}:
             </fo:block>
             <fo:block space-after="0.2in" color="red">
-                ${errorMessage?if_exists}
+                ${errorMessage!}
             </fo:block>
             <fo:block id="theEnd"/>
         </fo:flow>
Index: framework/common/webcommon/forgotPassword.ftl
===================================================================
--- framework/common/webcommon/forgotPassword.ftl	(revision 1590602)
+++ framework/common/webcommon/forgotPassword.ftl	(working copy)
@@ -23,7 +23,7 @@
       <h3>${uiLabelMap.CommonForgotYourPassword}?</h3>
     </div>
     <div class="screenlet-body">
-      <form method="post" action="<@ofbizUrl>forgotPassword${previousParams?if_exists}</@ofbizUrl>" name="forgotpassword">
+      <form method="post" action="<@ofbizUrl>forgotPassword${previousParams!}</@ofbizUrl>" name="forgotpassword">
         <table class="basic-table" cellspacing="0">
           <tr>
             <td class="label">${uiLabelMap.CommonUsername}</td>
Index: framework/common/webcommon/login.ftl
===================================================================
--- framework/common/webcommon/login.ftl	(revision 1590602)
+++ framework/common/webcommon/login.ftl	(working copy)
@@ -17,7 +17,7 @@
 under the License.
 -->
 
-<#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+<#if requestAttributes.uiLabelMap??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
 <#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")>
 
 <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))>
@@ -43,13 +43,13 @@
             <td><input type="password" name="PASSWORD" value="" size="20"/></td>
           </tr>
           <#if ("Y" == useMultitenant) >
-              <#if !requestAttributes.tenantId?exists>
+              <#if !requestAttributes.tenantId??>
                   <tr>
                       <td class="label">${uiLabelMap.CommonTenantId}</td>
-                      <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td>
+                      <td><input type="text" name="tenantId" value="${parameters.tenantId!}" size="20"/></td>
                   </tr>
               <#else>
-                  <input type="hidden" name="tenantId" value="${requestAttributes.tenantId?if_exists}"/>
+                  <input type="hidden" name="tenantId" value="${requestAttributes.tenantId!}"/>
               </#if>
           </#if>
           <tr>
Index: framework/common/webcommon/viewBlocked.ftl
===================================================================
--- framework/common/webcommon/viewBlocked.ftl	(revision 1590602)
+++ framework/common/webcommon/viewBlocked.ftl	(working copy)
@@ -23,7 +23,7 @@
       <h3>${uiLabelMap.CommonViewBlocked}</h3>
     </div>
     <div class="screenlet-body">
-        ${errorMessage?if_exists}
+        ${errorMessage!}
         <br />
     </div>
   </div>
Index: framework/common/webcommon/includes/ViewCertificate.ftl
===================================================================
--- framework/common/webcommon/includes/ViewCertificate.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/ViewCertificate.ftl	(working copy)
@@ -17,7 +17,7 @@
 under the License.
 -->
 
-<#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()?if_exists/>
+<#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()!/>
 <#if (requestParameters.certString?has_content)>
     <#assign cert = Static["org.ofbiz.base.util.KeyStoreUtil"].pemToCert(requestParameters.certString)/>
 </#if>
@@ -49,7 +49,7 @@
         <td>&nbsp;</td>
       </tr>
       <#list components as component>
-        <#assign keystores = component.getKeystoreInfos()?if_exists/>
+        <#assign keystores = component.getKeystoreInfos()!/>
           <#list keystores as store>
             <#if (store.isTrustStore())>
               <tr>
Index: framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
===================================================================
--- framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl	(working copy)
@@ -16,12 +16,12 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<#if description?exists>
-    <#if autocompleteOptions?exists>
+<#if description??>
+    <#if autocompleteOptions??>
         <#list autocompleteOptions as autocompleteOption>
             <#assign displayString = ""/>
             <#list displayFieldsSet as key>
-                <#assign field = autocompleteOption.get(key)?if_exists>
+                <#assign field = autocompleteOption.get(key)!>
                 <#if field?has_content>
                     <#if (key != context.returnField)>
                         <#assign displayString = displayString + field + " ">
@@ -35,7 +35,7 @@
 <script type="text/javascript">
 var autocomp = [
     <#if autocompleteOptions?has_content>
-        <#if !displayReturnField?exists>
+        <#if !displayReturnField??>
             <#assign displayReturnField = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.displayReturnField")>
         </#if>
         <#list autocompleteOptions as autocompleteOption>
@@ -43,7 +43,7 @@
             <#assign displayString = ""/>
             <#assign returnField = ""/>
             <#list displayFieldsSet as key>
-              <#assign field = autocompleteOption.get(key)?if_exists>
+              <#assign field = autocompleteOption.get(key)!>
               <#if field?has_content>
                   <#if (key == context.returnField)>
                       <#assign returnField = field/>
Index: framework/common/webcommon/includes/countries.ftl
===================================================================
--- framework/common/webcommon/includes/countries.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/countries.ftl	(working copy)
@@ -18,7 +18,7 @@
 -->
 <#assign countries = Static["org.ofbiz.common.CommonWorkers"].getCountryList(delegator)>
 <#list countries as country>
-    <#if defaultCountryGeoId?exists>
+    <#if defaultCountryGeoId??>
         <option value='${country.geoId}' ${(country.geoId==defaultCountryGeoId)?string("selected=\"selected\"","")}>${country.get("geoName",locale)?default(country.geoId)}</option>
     <#else>
         <option value='${country.geoId}'>${country.get("geoName",locale)?default(country.geoId)}</option>
Index: framework/common/webcommon/includes/genericLink.ftl
===================================================================
--- framework/common/webcommon/includes/genericLink.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/genericLink.ftl	(working copy)
@@ -17,17 +17,17 @@
 under the License.
 -->
 
-<#if requestParameters?exists && genericLinkName?exists && genericLinkTarget?exists && genericLinkText?exists>
-<form name="${genericLinkName}" <#if genericLinkWindow?exists>target="${genericLinkWindow}"</#if> action="<@ofbizUrl>${genericLinkTarget}</@ofbizUrl>" method="post">
-<#if (!excludeParameters?exists || excludeParameters != "N") && requestParameters?exists>
+<#if requestParameters?? && genericLinkName?? && genericLinkTarget?? && genericLinkText??>
+<form name="${genericLinkName}" <#if genericLinkWindow??>target="${genericLinkWindow}"</#if> action="<@ofbizUrl>${genericLinkTarget}</@ofbizUrl>" method="post">
+<#if (!excludeParameters?? || excludeParameters != "N") && requestParameters??>
 <#assign requestParameterKeys = requestParameters.keySet().iterator()>
 <#list requestParameterKeys as requestParameterKey>
 <#assign requestParameterValue = requestParameters.get(requestParameterKey)>
-<#if requestParameterValue?exists && requestParameterValue?has_content>
+<#if requestParameterValue?? && requestParameterValue?has_content>
 <input type="hidden" name="${requestParameterKey}" value="${requestParameterValue}"/>
 </#if>
 </#list>
 </#if>
-<a href="javascript:document.${genericLinkName}.submit();" <#if genericLinkStyle?exists>class="${genericLinkStyle}"</#if>>${genericLinkText}</a>
+<a href="javascript:document.${genericLinkName}.submit();" <#if genericLinkStyle??>class="${genericLinkStyle}"</#if>>${genericLinkText}</a>
 </form>
 </#if>
Index: framework/common/webcommon/includes/helplink.ftl
===================================================================
--- framework/common/webcommon/includes/helplink.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/helplink.ftl	(working copy)
@@ -18,6 +18,6 @@
 -->
 
 <#-- uncomment this to show the current screen help topic key (this is useful to cut and paste in the help link resources files
-${helpTopic?if_exists}
+${helpTopic!}
 -->
  
Index: framework/common/webcommon/includes/insertDropDown.ftl
===================================================================
--- framework/common/webcommon/includes/insertDropDown.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/insertDropDown.ftl	(working copy)
@@ -17,22 +17,22 @@
 under the License.
 -->
 
-${StringUtil.wrapString(topLine.textBegin?if_exists)}
+${StringUtil.wrapString(topLine.textBegin!)}
 <#assign listSize = topLine.dropDownList.size()>
 <#if topLine.dropDownList.size() gt 1>
 <form method="post" action="<@ofbizUrl>${topLine.action}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="${topLine.action}" id="${topLine.action}">
-  <#if topLine.hiddenFieldList?exists>
+  <#if topLine.hiddenFieldList??>
     <#list topLine.hiddenFieldList as field>
       <input type="hidden" name="${field.name}" value="${field.value}"/>
     </#list>
   </#if>
-  <select name="${topLine.selectionName?if_exists}" onchange="javascript:document.${topLine.action}.submit();">
+  <select name="${topLine.selectionName!}" onchange="javascript:document.${topLine.action}.submit();">
     <#list topLine.dropDownList as option>
-      <option <#if option.key == topLine.selectedKey >selected="selected"</#if> value="${option.key?if_exists}">${option.value?if_exists}</option>
+      <option <#if option.key == topLine.selectedKey >selected="selected"</#if> value="${option.key!}">${option.value!}</option>
     </#list>
   </select>
 </form>
 <#else>
-  ${topLine.dropDownList[0].value?if_exists}
+  ${topLine.dropDownList[0].value!}
 </#if>
-${StringUtil.wrapString(topLine.textEnd?if_exists)}
+${StringUtil.wrapString(topLine.textEnd!)}
Index: framework/common/webcommon/includes/lookup.ftl
===================================================================
--- framework/common/webcommon/includes/lookup.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/lookup.ftl	(working copy)
@@ -26,7 +26,7 @@
 <html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>${title?if_exists}</title>
+    <title>${title!}</title>
     <#-- the trick "<scr" + "ipt below is because browsers should not parse the contents of CDATA elements, but apparently they do. -->
     <script language="JavaScript" type="text/javascript">//<![CDATA[
     var jQueryLibLoaded = false;
Index: framework/common/webcommon/includes/messages.ftl
===================================================================
--- framework/common/webcommon/includes/messages.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/messages.ftl	(working copy)
@@ -19,20 +19,20 @@
 
 <#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
 <#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
-<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
+<#if requestAttributes.serviceValidationException??><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
 <#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
 
 <#if !errorMessage?has_content>
-  <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
+  <#assign errorMessage = requestAttributes._ERROR_MESSAGE_!>
 </#if>
 <#if !errorMessageList?has_content>
-  <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
+  <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_!>
 </#if>
 <#if !eventMessage?has_content>
-  <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
+  <#assign eventMessage = requestAttributes._EVENT_MESSAGE_!>
 </#if>
 <#if !eventMessageList?has_content>
-  <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
+  <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_!>
 </#if>
 
 <#-- display the error messages -->
Index: framework/common/webcommon/includes/setMultipleSelectJs.ftl
===================================================================
--- framework/common/webcommon/includes/setMultipleSelectJs.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/setMultipleSelectJs.ftl	(working copy)
@@ -16,13 +16,13 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<#if asm_multipleSelect?exists> <#-- we check only this var and suppose the others are also present -->
+<#if asm_multipleSelect??> <#-- we check only this var and suppose the others are also present -->
 <script type="text/javascript">
 jQuery(document).ready(function() {
-    multiple = jQuery("#${asm_multipleSelect?if_exists}");
+    multiple = jQuery("#${asm_multipleSelect!}");
 
-  <#if asm_title?exists>
-    // set the dropdown "title" if exists
+  <#if asm_title??>
+    // set the dropdown "title" if??
     multiple.attr('title', '${asm_title}');
   </#if>
   
@@ -34,7 +34,7 @@
       //, debugMode: true
     });
       
-  <#if asm_relatedField?exists> <#-- can be used without related field -->
+  <#if asm_relatedField??> <#-- can be used without related field -->
     // track possible relatedField changes
     // on initial focus (focus-field-name must be asm_relatedField) or if the field value changes, select related multi values. 
     typeValue = jQuery('#${asm_typeField}').val();
Index: framework/common/webcommon/includes/simple.fo.ftl
===================================================================
--- framework/common/webcommon/includes/simple.fo.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/simple.fo.ftl	(working copy)
@@ -55,7 +55,7 @@
                     <fo:table-row>
                         <fo:table-cell>
                             <fo:block>
-                            <#if logoImageUrl?exists>
+                            <#if logoImageUrl??>
                                 <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/>
                             </#if>
                             </fo:block>
@@ -63,7 +63,7 @@
                         <fo:table-cell>
                             <#-- The title of the report -->
                             <fo:block font-weight="bold" text-decoration="underline" space-after="0.03in">
-                                <#if titleProperty?exists>${uiLabelMap.get(titleProperty)}<#else>${title?if_exists}</#if>
+                                <#if titleProperty??>${uiLabelMap.get(titleProperty)}<#else>${title!}</#if>
                             </fo:block>
                             <#-- Username and date -->
                             <fo:list-block provisional-distance-between-starts="1in">
@@ -72,7 +72,7 @@
                                         <fo:block font-weight="bold">${uiLabelMap.CommonUsername}</fo:block>
                                     </fo:list-item-label>
                                     <fo:list-item-body start-indent="body-start()">
-                                        <fo:block><#if userLogin?exists>${userLogin.userLoginId?if_exists}</#if></fo:block>
+                                        <fo:block><#if userLogin??>${userLogin.userLoginId!}</#if></fo:block>
                                     </fo:list-item-body>
                                 </fo:list-item>
                                 <fo:list-item>
@@ -80,7 +80,7 @@
                                         <fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block>
                                     </fo:list-item-label>
                                     <fo:list-item-body start-indent="body-start()">
-                                        <fo:block>${nowTimestamp?if_exists}</fo:block>
+                                        <fo:block>${nowTimestamp!}</fo:block>
                                     </fo:list-item-body>
                                 </fo:list-item>
                             </fo:list-block>
Index: framework/common/webcommon/includes/simple.ftl
===================================================================
--- framework/common/webcommon/includes/simple.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/simple.ftl	(working copy)
@@ -26,7 +26,7 @@
 <html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>${layoutSettings.companyName?if_exists}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)?if_exists}</#if></title>
+    <title>${layoutSettings.companyName!}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)!}</#if></title>
     <#if layoutSettings.shortcutIcon?has_content>
       <link rel="shortcut icon" href="<@ofbizContentUrl>${layoutSettings.shortcutIcon}</@ofbizContentUrl>" />
     </#if>
Index: framework/common/webcommon/includes/states.ftl
===================================================================
--- framework/common/webcommon/includes/states.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/states.ftl	(working copy)
@@ -22,7 +22,7 @@
 </#list>
 
 <#-- Here is some alternate code to get states limited to a region
-<#if requestParameters.CUSTOMER_COUNTRY?exists>
+<#if requestParameters.CUSTOMER_COUNTRY??>
     <#assign stateAssocs = Static["org.ofbiz.common.CommonWorkers"].getAssociatedStateList(delegator,requestParameters.CUSTOMER_COUNTRY)>
 <#else>
     <#assign stateAssocs = Static["org.ofbiz.common.CommonWorkers"].getAssociatedStateList(delegator,null)>
Index: framework/common/webcommon/includes/fo/basic-header.fo.ftl
===================================================================
--- framework/common/webcommon/includes/fo/basic-header.fo.ftl	(revision 1590602)
+++ framework/common/webcommon/includes/fo/basic-header.fo.ftl	(working copy)
@@ -19,7 +19,7 @@
 <#escape x as x?xml>
         <fo:static-content flow-name="xsl-region-before">
           <fo:block font-size="${(layoutSettings.headerFontSize)?default("14pt")}" text-align="center" margin-bottom="14pt">
-            ${(layoutSettings.documentTitle)?if_exists}
+            ${(layoutSettings.documentTitle)!}
           </fo:block>
         </fo:static-content>
 </#escape>
Index: framework/common/webcommon/portal/listPortalPortlets.ftl
===================================================================
--- framework/common/webcommon/portal/listPortalPortlets.ftl	(revision 1590602)
+++ framework/common/webcommon/portal/listPortalPortlets.ftl	(working copy)
@@ -40,7 +40,7 @@
               <form method="post" action="<@ofbizUrl>createPortalPagePortlet</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a>
             </div>
             <div>
-              ${portalPortlet.description?if_exists}
+              ${portalPortlet.description!}
             </div>
             <div>
               ${parameters.portletCategoryId}
Index: framework/common/webcommon/portal/showPortlet.ftl
===================================================================
--- framework/common/webcommon/portal/showPortlet.ftl	(revision 1590602)
+++ framework/common/webcommon/portal/showPortlet.ftl	(working copy)
@@ -27,5 +27,5 @@
   </td></tr>
 </table>
 <#else/>
-<h2>Portlet '${parameters.portalPortletId?if_exists}' not found. You may not have the necessary seed or other data for it.</h2>
+<h2>Portlet '${parameters.portalPortletId!}' not found. You may not have the necessary seed or other data for it.</h2>
 </#if>
Index: framework/webapp/config/url.properties
===================================================================
--- framework/webapp/config/url.properties	(revision 1590602)
+++ framework/webapp/config/url.properties	(working copy)
@@ -22,11 +22,11 @@
 
 # HTTPS Port (Secure port)
 port.https.enabled=Y
-port.https=8443
+port.https=38443
 force.https.host=
 
 # HTTP Port (Not Secure port)
-port.http=8080
+port.http=38080
 force.http.host=
 
 # Static Content URLs to make it easy to move the serving load for static content to other machines
Index: framework/webtools/webapp/webtools/ping.ftl
===================================================================
--- framework/webtools/webapp/webtools/ping.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/ping.ftl	(working copy)
@@ -17,5 +17,5 @@
 under the License.
 -->
 
-${requestAttributes._ERROR_MESSAGE_?if_exists}
-${requestAttributes.message?if_exists}
\ No newline at end of file
+${requestAttributes._ERROR_MESSAGE_!}
+${requestAttributes.message!}
\ No newline at end of file
Index: framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
===================================================================
--- framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl	(working copy)
@@ -28,12 +28,12 @@
   </div>
 </#if>
 
-<#if !artifactInfo?exists>
+<#if !artifactInfo??>
 
     <#-- add form here to specify artifact info name. -->
     <div>
       <form name="ArtifactInfoByName" method="post" action="<@ofbizUrl>ArtifactInfo</@ofbizUrl>" class="basic-form">
-        Search Names/Locations: <input type="text" name="name" value="${parameters.name?if_exists}" size="40"/>
+        Search Names/Locations: <input type="text" name="name" value="${parameters.name!}" size="40"/>
         <select name="type">
           <option></option>
           <option>entity</option>
@@ -49,8 +49,8 @@
     </div>
     <div>
       <form name="ArtifactInfoByNameAndType" method="post" action="<@ofbizUrl>ArtifactInfo</@ofbizUrl>" class="basic-form">
-        <div>Name: <input type="text" name="name" value="${parameters.name?if_exists}" size="40"/></div>
-        <div>Location: <input type="text" name="location" value="${parameters.location?if_exists}" size="60"/></div>
+        <div>Name: <input type="text" name="name" value="${parameters.name!}" size="40"/></div>
+        <div>Location: <input type="text" name="location" value="${parameters.location!}" size="60"/></div>
         <div>Type:
           <select name="type">
             <option>entity</option>
@@ -78,7 +78,7 @@
 <#else/>
 
     <h1>${uiLabelMap.WebtoolsArtifactInfo} (${artifactInfo.getDisplayType()}): ${artifactInfo.getDisplayName()}</h1>
-    <#if artifactInfo.getLocationURL()?exists>
+    <#if artifactInfo.getLocationURL()??>
         <div>Defined in: <a href="${artifactInfo.getLocationURL()}">${artifactInfo.getLocationURL()}</a></div>
     </#if>
 
@@ -87,41 +87,41 @@
         <h2>Entity Fields</h2>
         <table>
         <#list artifactInfo.modelEntity.getFieldsUnmodifiable() as modelField>
-            <tr><td>${modelField.getName()}<#if modelField.getIsPk()>*</#if></td><td>${modelField.getType()}</td><td>${modelField.getDescription()?if_exists}</td></tr>
+            <tr><td>${modelField.getName()}<#if modelField.getIsPk()>*</#if></td><td>${modelField.getType()}</td><td>${modelField.getDescription()!}</td></tr>
         </#list>
         </table>
 
         <div>
         <h2>Entities Related (One)</h2>
-        <#list artifactInfo.getEntitiesRelatedOne()?if_exists as entityArtifactInfo>
+        <#list artifactInfo.getEntitiesRelatedOne()! as entityArtifactInfo>
             <@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Entities Related (Many)</h2>
-        <#list artifactInfo.getEntitiesRelatedMany()?if_exists as entityArtifactInfo>
+        <#list artifactInfo.getEntitiesRelatedMany()! as entityArtifactInfo>
             <@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Services Using This Entity</h2>
-        <#list artifactInfo.getServicesUsingEntity()?if_exists as serviceArtifactInfo>
+        <#list artifactInfo.getServicesUsingEntity()! as serviceArtifactInfo>
             <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Forms Using This Entity</h2>
-        <#list artifactInfo.getFormsUsingEntity()?if_exists as formWidgetArtifactInfo>
+        <#list artifactInfo.getFormsUsingEntity()! as formWidgetArtifactInfo>
             <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Screens Using This Entity</h2>
-        <#list artifactInfo.getScreensUsingEntity()?if_exists as screenWidgetArtifactInfo>
+        <#list artifactInfo.getScreensUsingEntity()! as screenWidgetArtifactInfo>
             <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
         </#list>
         </div>
@@ -130,75 +130,75 @@
         <h2>Service Info</h2>
         <div>&nbsp;Description: ${artifactInfo.modelService.description}</div>
         <div>&nbsp;Run (${artifactInfo.modelService.engineName}): ${artifactInfo.modelService.location} :: ${artifactInfo.modelService.invoke}</div>
-        <div>&nbsp;Impl Location: <a href="${artifactInfo.getImplementationLocationURL()?if_exists}">${artifactInfo.getImplementationLocationURL()?if_exists}</a></div>
+        <div>&nbsp;Impl Location: <a href="${artifactInfo.getImplementationLocationURL()!}">${artifactInfo.getImplementationLocationURL()!}</a></div>
         <h2>Service Parameters</h2>
         <table>
             <tr><td>Name</td><td>Type</td><td>Optional</td><td>Mode</td><td>Entity.field</td></tr>
         <#list artifactInfo.modelService.getAllParamNames() as paramName>
             <#assign modelParam = artifactInfo.modelService.getParam(paramName)/>
-            <tr><td>${modelParam.getName()}<#if modelParam.getInternal()> (internal)</#if></td><td>${modelParam.getType()}</td><td><#if modelParam.isOptional()>optional<#else/>required</#if></td><td>${modelParam.getMode()}</td><td>${modelParam.getEntityName()?if_exists}.${modelParam.getFieldName()?if_exists}</td></tr>
+            <tr><td>${modelParam.getName()}<#if modelParam.getInternal()> (internal)</#if></td><td>${modelParam.getType()}</td><td><#if modelParam.isOptional()>optional<#else/>required</#if></td><td>${modelParam.getMode()}</td><td>${modelParam.getEntityName()!}.${modelParam.getFieldName()!}</td></tr>
         </#list>
         </table>
 
         <div>
         <h2>Entities Used By This Service</h2>
-        <#list artifactInfo.getEntitiesUsedByService()?if_exists as entityArtifactInfo>
+        <#list artifactInfo.getEntitiesUsedByService()! as entityArtifactInfo>
             <@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Services Calling This Service</h2>
-        <#list artifactInfo.getServicesCallingService()?if_exists as serviceArtifactInfo>
+        <#list artifactInfo.getServicesCallingService()! as serviceArtifactInfo>
             <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Services Called By This Service</h2>
-        <#list artifactInfo.getServicesCalledByService()?if_exists as serviceArtifactInfo>
+        <#list artifactInfo.getServicesCalledByService()! as serviceArtifactInfo>
             <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Service ECA Rules Triggered By This Service</h2>
-        <#list artifactInfo.getServiceEcaRulesTriggeredByService()?if_exists as serviceEcaArtifactInfo>
+        <#list artifactInfo.getServiceEcaRulesTriggeredByService()! as serviceEcaArtifactInfo>
             <@displayServiceEcaArtifactInfo serviceEcaArtifactInfo=serviceEcaArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Service ECA Rules Calling This Service</h2>
-        <#list artifactInfo.getServiceEcaRulesCallingService()?if_exists as serviceEcaArtifactInfo>
+        <#list artifactInfo.getServiceEcaRulesCallingService()! as serviceEcaArtifactInfo>
             <@displayServiceEcaArtifactInfo serviceEcaArtifactInfo=serviceEcaArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Forms Calling This Service</h2>
-        <#list artifactInfo.getFormsCallingService()?if_exists as formWidgetArtifactInfo>
+        <#list artifactInfo.getFormsCallingService()! as formWidgetArtifactInfo>
             <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Forms Based On This Service</h2>
-        <#list artifactInfo.getFormsBasedOnService()?if_exists as formWidgetArtifactInfo>
+        <#list artifactInfo.getFormsBasedOnService()! as formWidgetArtifactInfo>
             <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Screens Calling This Service</h2>
-        <#list artifactInfo.getScreensCallingService()?if_exists as screenWidgetArtifactInfo>
+        <#list artifactInfo.getScreensCallingService()! as screenWidgetArtifactInfo>
             <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Requests with Events That Call This Service</h2>
-        <#list artifactInfo.getRequestsWithEventCallingService()?if_exists as controllerRequestArtifactInfo>
+        <#list artifactInfo.getRequestsWithEventCallingService()! as controllerRequestArtifactInfo>
             <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
         </#list>
         </div>
@@ -206,48 +206,48 @@
     <#elseif artifactInfo.getType() == "form"/>
         <div>
         <h2>Form Extended by This Form</h2>
-        <#if artifactInfo.getFormThisFormExtends()?exists>
+        <#if artifactInfo.getFormThisFormExtends()??>
             <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=artifactInfo.getFormThisFormExtends()/>
         </#if>
         </div>
 
         <div>
         <h2>Entities Used in This Form</h2>
-        <#list artifactInfo.getEntitiesUsedInForm()?if_exists as entityArtifactInfo>
+        <#list artifactInfo.getEntitiesUsedInForm()! as entityArtifactInfo>
             <@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Services Used in This Form</h2>
-        <#list artifactInfo.getServicesUsedInForm()?if_exists as serviceArtifactInfo>
+        <#list artifactInfo.getServicesUsedInForm()! as serviceArtifactInfo>
             <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Forms Extending This Form</h2>
-        <#list artifactInfo.getFormsExtendingThisForm()?if_exists as formWidgetArtifactInfo>
+        <#list artifactInfo.getFormsExtendingThisForm()! as formWidgetArtifactInfo>
             <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Screens Including This Form</h2>
-        <#list artifactInfo.getScreensIncludingThisForm()?if_exists as screenWidgetArtifactInfo>
+        <#list artifactInfo.getScreensIncludingThisForm()! as screenWidgetArtifactInfo>
             <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Controller Requests That Are Linked to in This Form</h2>
-        <#list artifactInfo.getRequestsLinkedToInForm()?if_exists as controllerRequestArtifactInfo>
+        <#list artifactInfo.getRequestsLinkedToInForm()! as controllerRequestArtifactInfo>
             <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
         </#list>
         </div>
         <div>
         <h2>Controller Requests That Are Targeted By This Form</h2>
-        <#list artifactInfo.getRequestsTargetedByForm()?if_exists as controllerRequestArtifactInfo>
+        <#list artifactInfo.getRequestsTargetedByForm()! as controllerRequestArtifactInfo>
             <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
         </#list>
         </div>
@@ -255,55 +255,55 @@
     <#elseif artifactInfo.getType() == "screen"/>
         <div>
         <h2>Entities Used in This Screen</h2>
-        <#list artifactInfo.getEntitiesUsedInScreen()?if_exists as entityArtifactInfo>
+        <#list artifactInfo.getEntitiesUsedInScreen()! as entityArtifactInfo>
             <@displayEntityArtifactInfo entityArtifactInfo=entityArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Services Used in This Screen</h2>
-        <#list artifactInfo.getServicesUsedInScreen()?if_exists as serviceArtifactInfo>
+        <#list artifactInfo.getServicesUsedInScreen()! as serviceArtifactInfo>
             <@displayServiceArtifactInfo serviceArtifactInfo=serviceArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Forms Included in This Screen</h2>
-        <#list artifactInfo.getFormsIncludedInScreen()?if_exists as formWidgetArtifactInfo>
+        <#list artifactInfo.getFormsIncludedInScreen()! as formWidgetArtifactInfo>
             <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Screens Include in This Screen</h2>
-        <#list artifactInfo.getScreensIncludedInScreen()?if_exists as screenWidgetArtifactInfo>
+        <#list artifactInfo.getScreensIncludedInScreen()! as screenWidgetArtifactInfo>
             <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Screens Including This Screen</h2>
-        <#list artifactInfo.getScreensIncludingThisScreen()?if_exists as screenWidgetArtifactInfo>
+        <#list artifactInfo.getScreensIncludingThisScreen()! as screenWidgetArtifactInfo>
             <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Controller Requests That Are Linked to in This Screen</h2>
-        <#list artifactInfo.getRequestsLinkedToInScreen()?if_exists as controllerRequestArtifactInfo>
+        <#list artifactInfo.getRequestsLinkedToInScreen()! as controllerRequestArtifactInfo>
             <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Controller Views Referring to This Screen</h2>
-        <#list artifactInfo.getViewsReferringToScreen()?if_exists as controllerViewArtifactInfo>
+        <#list artifactInfo.getViewsReferringToScreen()! as controllerViewArtifactInfo>
             <@displayControllerViewArtifactInfo controllerViewArtifactInfo=controllerViewArtifactInfo/>
         </#list>
         </div>
 
     <#elseif artifactInfo.getType() == "request"/>
-        <#if artifactInfo.getServiceCalledByRequestEvent()?exists>
+        <#if artifactInfo.getServiceCalledByRequestEvent()??>
             <div>
             <h2>Service Called by Request Event</h2>
             <@displayServiceArtifactInfo serviceArtifactInfo=artifactInfo.getServiceCalledByRequestEvent()/>
@@ -312,41 +312,41 @@
 
         <div>
         <h2>Forms Referring to This Request</h2>
-        <#list artifactInfo.getFormInfosReferringToRequest()?if_exists as formWidgetArtifactInfo>
+        <#list artifactInfo.getFormInfosReferringToRequest()! as formWidgetArtifactInfo>
             <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
         </#list>
         </div>
         <div>
         <h2>Forms Targeting This Request</h2>
-        <#list artifactInfo.getFormInfosTargetingRequest()?if_exists as formWidgetArtifactInfo>
+        <#list artifactInfo.getFormInfosTargetingRequest()! as formWidgetArtifactInfo>
             <@displayFormWidgetArtifactInfo formWidgetArtifactInfo=formWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Screens Referring to This Request</h2>
-        <#list artifactInfo.getScreenInfosReferringToRequest()?if_exists as screenWidgetArtifactInfo>
+        <#list artifactInfo.getScreenInfosReferringToRequest()! as screenWidgetArtifactInfo>
             <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=screenWidgetArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Requests That Are Responses to This Request</h2>
-        <#list artifactInfo.getRequestsThatAreResponsesToThisRequest()?if_exists as controllerRequestArtifactInfo>
+        <#list artifactInfo.getRequestsThatAreResponsesToThisRequest()! as controllerRequestArtifactInfo>
             <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
         </#list>
         </div>
         
         <div>
         <h2>Requests That This Request is a Responses To</h2>
-        <#list artifactInfo.getRequestsThatThisRequestIsResponsTo()?if_exists as controllerRequestArtifactInfo>
+        <#list artifactInfo.getRequestsThatThisRequestIsResponsTo()! as controllerRequestArtifactInfo>
             <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
         </#list>
         </div>
 
         <div>
         <h2>Controller Views That Are Responses to This Request</h2>
-        <#list artifactInfo.getViewsThatAreResponsesToThisRequest()?if_exists as controllerViewArtifactInfo>
+        <#list artifactInfo.getViewsThatAreResponsesToThisRequest()! as controllerViewArtifactInfo>
             <@displayControllerViewArtifactInfo controllerViewArtifactInfo=controllerViewArtifactInfo/>
         </#list>
         </div>
@@ -354,12 +354,12 @@
     <#elseif artifactInfo.getType() == "view"/>
         <div>
         <h2>Requests That This View is a Responses To</h2>
-        <#list artifactInfo.getRequestsThatThisViewIsResponseTo()?if_exists as controllerRequestArtifactInfo>
+        <#list artifactInfo.getRequestsThatThisViewIsResponseTo()! as controllerRequestArtifactInfo>
             <@displayControllerRequestArtifactInfo controllerRequestArtifactInfo=controllerRequestArtifactInfo/>
         </#list>
         </div>
 
-        <#if artifactInfo.getScreenCalledByThisView()?exists>
+        <#if artifactInfo.getScreenCalledByThisView()??>
             <div>
             <h2>Screen Called by This View</h2>
             <@displayScreenWidgetArtifactInfo screenWidgetArtifactInfo=artifactInfo.getScreenCalledByThisView()/>
Index: framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl
===================================================================
--- framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl	(working copy)
@@ -18,9 +18,9 @@
 -->
 
 <#assign isSecure = request.isSecure()/>
-<#assign clientCerts = request.getAttribute("javax.servlet.request.X509Certificate")?if_exists/>
+<#assign clientCerts = request.getAttribute("javax.servlet.request.X509Certificate")!/>
 <#if (!clientCerts?has_content)>
-    <#assign clientCerts = request.getAttribute("javax.net.ssl.peer_certificates")?if_exists/>
+    <#assign clientCerts = request.getAttribute("javax.net.ssl.peer_certificates")!/>
 </#if>
 
 <div class="screenlet">
@@ -31,7 +31,7 @@
     <#if (clientCerts?has_content)>
       <table class="basic-table">
         <#list clientCerts as cert>
-          <#assign certString = Static["org.ofbiz.base.util.KeyStoreUtil"].certToString(cert)?if_exists>
+          <#assign certString = Static["org.ofbiz.base.util.KeyStoreUtil"].certToString(cert)!>
           <#if (certString?has_content)>
             <tr>
               <td class="label">${uiLabelMap.WebtoolsCertsCert}</td>
Index: framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
===================================================================
--- framework/webtools/webapp/webtools/datafile/viewdatafile.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/datafile/viewdatafile.ftl	(working copy)
@@ -23,7 +23,7 @@
         <table class="basic-table" cellspacing="0">
           <tr>
             <td class="label">${uiLabelMap.WebtoolsDataDefinitionFileName}</td>
-            <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${parameters.DEFINITION_LOCATION?if_exists}" /></td>
+            <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${parameters.DEFINITION_LOCATION!}" /></td>
             <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if> /></td>
           </tr>
           <tr>
@@ -34,28 +34,28 @@
                   <option value=""></option>
                   <#list definitionNames as oneDefinitionName>
                     boolean isSelected = definitionName?? && definitionName.equals(oneDefinitionName);
-                    <option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?exists && parameters.DEFINITION_NAME == oneDefinitionName> selected="selected" </#if>>${oneDefinitionName}</option>
+                    <option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?? && parameters.DEFINITION_NAME == oneDefinitionName> selected="selected" </#if>>${oneDefinitionName}</option>
                   </#list>
                 </select>
               <#else>
-                <input name="DEFINITION_NAME" type="text" size="30" value="${definitionName?if_exists}" />
+                <input name="DEFINITION_NAME" type="text" size="30" value="${definitionName!}" />
               </#if>
             </td>
             <td>&nbsp;</td>
           </tr>
           <tr>
             <td class="label">${uiLabelMap.WebtoolsDataFileName}</td>
-            <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${parameters.DATAFILE_LOCATION?if_exists}" /></td>
+            <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${parameters.DATAFILE_LOCATION!}" /></td>
             <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if> /></td>
           </tr>
           <tr>
             <td class="label">${uiLabelMap.WebtoolsDataSaveToFile}</td>
-            <td><input name="DATAFILE_SAVE" type="text" size="60" value="${parameters.DATAFILE_SAVE?if_exists}"/></td>
+            <td><input name="DATAFILE_SAVE" type="text" size="60" value="${parameters.DATAFILE_SAVE!}"/></td>
             <td>&nbsp;</td>
           </tr>
           <tr>
             <td class="label">${uiLabelMap.WebtoolsDataSaveToXml}</td>
-            <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${parameters.ENTITYXML_FILE_SAVE?if_exists}" /></td>
+            <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${parameters.ENTITYXML_FILE_SAVE!}" /></td>
             <td>&nbsp;</td>
           </tr>
           <tr>
Index: framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/entity/ConnectionPoolStatus.ftl	(working copy)
@@ -18,7 +18,7 @@
 -->
 <h1>Connection Pool Status</h1>
 
-<#assign groups = delegator.getModelGroupReader().getGroupNames(delegator.getDelegatorName())?if_exists/>
+<#assign groups = delegator.getModelGroupReader().getGroupNames(delegator.getDelegatorName())!/>
 <table class="basic-table light-grid hover-bar">
     <tr class="header-row">
         <td>Helper Name</td>
@@ -34,20 +34,20 @@
     <#assign alt_row = false>
     <#if (groups?has_content)>
         <#list groups as group>
-            <#assign helper = delegator.getGroupHelperName(group)?if_exists/>
+            <#assign helper = delegator.getGroupHelperName(group)!/>
             <#if (helper?has_content)>
-                <#assign dataSourceInfo = Static["org.ofbiz.entity.connection.DBCPConnectionFactory"].getDataSourceInfo(helper)?if_exists/>
+                <#assign dataSourceInfo = Static["org.ofbiz.entity.connection.DBCPConnectionFactory"].getDataSourceInfo(helper)!/>
                 <#if (dataSourceInfo?has_content)>
                     <tr>
                         <td>${helper}</td>
-                        <td>${dataSourceInfo.poolNumActive?if_exists}</td>
-                        <td>${dataSourceInfo.poolNumIdle?if_exists}</td>
-                        <td>${dataSourceInfo.poolNumTotal?if_exists}</td>
-                        <td>${dataSourceInfo.poolMaxActive?if_exists}</td>
-                        <td>${dataSourceInfo.poolMaxIdle?if_exists}</td>
-                        <td>${dataSourceInfo.poolMinIdle?if_exists}</td>
-                        <td>${dataSourceInfo.poolMinEvictableIdleTimeMillis?if_exists}</td>
-                        <td>${dataSourceInfo.poolMaxWait?if_exists}</td>
+                        <td>${dataSourceInfo.poolNumActive!}</td>
+                        <td>${dataSourceInfo.poolNumIdle!}</td>
+                        <td>${dataSourceInfo.poolNumTotal!}</td>
+                        <td>${dataSourceInfo.poolMaxActive!}</td>
+                        <td>${dataSourceInfo.poolMaxIdle!}</td>
+                        <td>${dataSourceInfo.poolMinIdle!}</td>
+                        <td>${dataSourceInfo.poolMinEvictableIdleTimeMillis!}</td>
+                        <td>${dataSourceInfo.poolMaxWait!}</td>
                     </tr>
                 </#if>
             </#if>
Index: framework/webtools/webapp/webtools/entity/EntityExportAll.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityExportAll.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/entity/EntityExportAll.ftl	(working copy)
@@ -28,7 +28,7 @@
 </#if>
 <hr />
 <form method="post" action="<@ofbizUrl>entityExportAll</@ofbizUrl>">
-    ${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" size="60" name="outpath" value="${outpath?if_exists}" /><br />
+    ${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" size="60" name="outpath" value="${outpath!}" /><br />
     ${uiLabelMap.CommonFromDate}: <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/><br/>
     ${uiLabelMap.WebtoolsTimeoutSeconds}: <input type="text" size="6" value="${txTimeout?default('7200')}" name="txTimeout"/><br />
     <br />
Index: framework/webtools/webapp/webtools/entity/EntityImport.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityImport.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/entity/EntityImport.ftl	(working copy)
@@ -23,14 +23,14 @@
 
   <form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>">
     ${uiLabelMap.WebtoolsAbsoluteFileNameOrUrl}:<br />
-    <input type="text" size="60" name="filename" value="${filename?if_exists}"/><br />
+    <input type="text" size="60" name="filename" value="${filename!}"/><br />
     ${uiLabelMap.WebtoolsAbsoluteFTLFilename}:<br />
-    <input type="text" size="40" name="fmfilename" value="${fmfilename?if_exists}"/><br />
-    <input type="checkbox" name="isUrl" <#if isUrl?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}<br />
-    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
-    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
-    <input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
-    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+    <input type="text" size="40" name="fmfilename" value="${fmfilename!}"/><br />
+    <input type="checkbox" name="isUrl" <#if isUrl??>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}<br />
+    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
+    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
+    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
+    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
     ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
     <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>
   </form>
@@ -39,7 +39,7 @@
     <textarea rows="20" cols="85" name="fulltext">${fulltext?default("<entity-engine-xml>\n</entity-engine-xml>")}</textarea>
     <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportText}"/></div>
   </form>
-  <#if messages?exists>
+  <#if messages??>
       <hr />
       <h3>${uiLabelMap.WebtoolsResults}:</h3>
       <#list messages as message>
Index: framework/webtools/webapp/webtools/entity/EntityImportDir.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityImportDir.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/entity/EntityImportDir.ftl	(working copy)
@@ -23,17 +23,17 @@
 
   <form method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>">
     ${uiLabelMap.WebtoolsAbsolutePath}:<br />
-    <input type="text" size="60" name="path" value="${path?if_exists}"/><br />
-    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
-    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
-    <input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
-    <input type="checkbox" name="deleteFiles" <#if (deleteFiles?exists)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}<br />
-    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+    <input type="text" size="60" name="path" value="${path!}"/><br />
+    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br />
+    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
+    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
+    <input type="checkbox" name="deleteFiles" <#if (deleteFiles??)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}<br />
+    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
     ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
     ${uiLabelMap.WebtoolsPause}:<input type="text" size="6" value="${filePauseStr?default("0")}" name="filePause"/><br />
     <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div>
   </form>
-  <#if messages?exists>
+  <#if messages??>
     <hr />
     <h1>${uiLabelMap.WebtoolsResults}:</h1>
     <#list messages as message>
Index: framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl	(working copy)
@@ -23,14 +23,14 @@
   <form method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>">
     Enter Readers (comma separated, no spaces; from entityengine.xml and ofbiz-component.xml files; common ones include seed,ext,demo):<br />
     <input type="text" size="60" name="readers" value="${readers?default("seed")}"/><br />
-    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMostlyInserts}<br />
-    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
-    <input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
-    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly?exists>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
+    <input type="checkbox" name="mostlyInserts" <#if mostlyInserts??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMostlyInserts}<br />
+    <input type="checkbox" name="maintainTimeStamps" <#if keepStamps??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}<br />
+    <input type="checkbox" name="createDummyFks" <#if createDummyFks??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}<br />
+    <input type="checkbox" name="checkDataOnly" <#if checkDataOnly??>checked="checked"</#if> value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}<br />
     ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br />
     <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImport}"/></div>
   </form>
-  <#if messages?exists>
+  <#if messages??>
       <hr />
       <h3>${uiLabelMap.WebtoolsResults}:</h3>
       <#list messages as message>
Index: framework/webtools/webapp/webtools/entity/EntityMaint.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityMaint.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/entity/EntityMaint.ftl	(working copy)
@@ -22,11 +22,11 @@
           <select name="filterByGroupName">
              <option value="">${uiLabelMap.CommonAll}</option>
              <#list entityGroups as group>
-                <option value="${group}" <#if filterByGroupName?exists><#if group = filterByGroupName>selected="selected"</#if></#if>>${group}</option>
+                <option value="${group}" <#if filterByGroupName??><#if group = filterByGroupName>selected="selected"</#if></#if>>${group}</option>
              </#list>
           </select>
           <b>${uiLabelMap.WebtoolsEntityName}:</b>
-          <input type= "text" name= "filterByEntityName" value="${parameters.filterByEntityName?if_exists}"/>
+          <input type= "text" name= "filterByEntityName" value="${parameters.filterByEntityName!}"/>
           <input type="submit" value="${uiLabelMap.CommonApply}"/>
        </form>
     </div>
Index: framework/webtools/webapp/webtools/entity/EntityRefList.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntityRefList.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/entity/EntityRefList.ftl	(working copy)
@@ -67,7 +67,7 @@
                     <#if forstatic>
                         <a href="<@ofbizUrl>entityref_main#${entity.entityName}</@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
                     <#else>
-                        <a href="<@ofbizUrl>view/entityref_main#${entity.entityName}${entity.url?if_exists}</@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
+                        <a href="<@ofbizUrl>view/entityref_main#${entity.entityName}${entity.url!}</@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
                     </#if>
                     <br />
                 </#list>
Index: framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl	(working copy)
@@ -25,7 +25,7 @@
             <td>
                 <select name="group">
                     <#list groups as group>
-                        <option value="${group}" <#if selGroup?exists><#if group = selGroup>selected="selected"</#if></#if>>${group}</option>
+                        <option value="${group}" <#if selGroup??><#if group = selGroup>selected="selected"</#if></#if>>${group}</option>
                     </#list>
                 </select>
             </td>
@@ -35,7 +35,7 @@
                 ${uiLabelMap.WebtoolsSqlCommand}
             </td>
             <td>
-                <textarea name="sqlCommand" cols="100" rows="5">${sqlCommand?if_exists}</textarea>
+                <textarea name="sqlCommand" cols="100" rows="5">${sqlCommand!}</textarea>
             </td>
         </tr>
         <tr>
@@ -80,7 +80,7 @@
             <#list records as record>
                 <tr <#if alt_row> class="alternate-row"</#if> >
                 <#list record as field>
-                    <td>${field?if_exists}</td>
+                    <td>${field!}</td>
                 </#list>
                 </tr>
                 <#assign alt_row = !alt_row>
Index: framework/webtools/webapp/webtools/entity/ListGeneric.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/ListGeneric.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/entity/ListGeneric.ftl	(working copy)
@@ -38,7 +38,7 @@
                         </#if>
                         </td>
                         <#list fieldList as field>
-                            <td>${record.fields.get(field.name)?if_exists?string}</td>
+                            <td>${record.fields.get(field.name)!?string}</td>
                         </#list>
                     </tr>
                     <#assign alt_row = !alt_row>
Index: framework/webtools/webapp/webtools/entity/xmldsdump.ftl
===================================================================
--- framework/webtools/webapp/webtools/entity/xmldsdump.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/entity/xmldsdump.ftl	(working copy)
@@ -16,7 +16,7 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<#if tobrowser?exists && tobrowser>
+<#if tobrowser?? && tobrowser>
 <h1>${uiLabelMap.WebtoolsExportFromDataSource}</h1>
 <br />
 <p>This page can be used to export data from the database. The exported documents will have a root tag of "&lt;entity-engine-xml&gt;".</p>
@@ -59,7 +59,7 @@
     <table class="basic-table">
       <tr>
         <td class="label">${uiLabelMap.WebtoolsOutputDirectory}</td>
-        <td><input type="text" size="60" name="outpath" value="${parameters.outpath?if_exists}"/></td>
+        <td><input type="text" size="60" name="outpath" value="${parameters.outpath!}"/></td>
       </tr>
       <tr>
         <td class="label">${uiLabelMap.WebtoolsMaxRecordsPerFile}</td>
@@ -67,7 +67,7 @@
       </tr>
       <tr>
         <td class="label">${uiLabelMap.WebtoolsSingleFilename}</td>
-        <td><input type="text" size="60" name="filename" value="${parameters.filename?if_exists}"/></td>
+        <td><input type="text" size="60" name="filename" value="${parameters.filename!}"/></td>
       </tr>
       <tr>
         <td class="label">${uiLabelMap.WebtoolsRecordsUpdatedSince}</td>
@@ -90,7 +90,7 @@
     <p>${uiLabelMap.WebtoolsEntityNames}:</p>
     <@displayButtonBar/>
       <div>${uiLabelMap.WebtoolsEntitySyncDump}:
-        <input name="entitySyncId" size="30" value="${entitySyncId?if_exists}"/>
+        <input name="entitySyncId" size="30" value="${entitySyncId!}"/>
       </div>
       ${uiLabelMap.WebtoolsPreConfiguredSet}:
       <select name="preConfiguredSetName">
Index: framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl
===================================================================
--- framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl	(working copy)
@@ -25,7 +25,7 @@
           ${uiLabelMap.WebtoolsLabelManagerKey}
         </td>
         <td>
-          <input type="text" name="labelKey" size="30" maxlength="70" value="${parameters.labelKey?if_exists}" />
+          <input type="text" name="labelKey" size="30" maxlength="70" value="${parameters.labelKey!}" />
         </td>
         <td class="label">
           ${uiLabelMap.WebtoolsLabelManagerComponentName}
@@ -34,7 +34,7 @@
           <select name="labelComponentName">
             <option value="">${uiLabelMap.WebtoolsLabelManagerAllComponents}</option>
             <#list componentNamesFound as componentNameFound>
-              <option <#if parameters.labelComponentName?exists && parameters.labelComponentName == componentNameFound>selected="selected"</#if> value="${componentNameFound}">${componentNameFound}</option>
+              <option <#if parameters.labelComponentName?? && parameters.labelComponentName == componentNameFound>selected="selected"</#if> value="${componentNameFound}">${componentNameFound}</option>
             </#list>
           </select>
         </td>
@@ -48,7 +48,7 @@
             <option value="">${uiLabelMap.WebtoolsLabelManagerAllFiles}</option>
             <#list filesFound as fileInfo>
               <#assign fileName = fileInfo.getFileName()/>
-              <option <#if parameters.labelFileName?exists && parameters.labelFileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option>
+              <option <#if parameters.labelFileName?? && parameters.labelFileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option>
             </#list>
           </select>
         </td>
@@ -59,7 +59,7 @@
           <select name="labelLocaleName">
             <option value="">${uiLabelMap.WebtoolsLabelManagerAllLocales}</option>
             <#list localesFound as localeFound>
-              <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)?if_exists/>
+              <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/>
               <#assign langAttr = localeFound.toString()?replace("_", "-")>
               <#assign langDir = "ltr">
               <#if 1 < langAttr?length>
@@ -67,7 +67,7 @@
                   <#assign langDir = "rtl">
                 </#if>
               </#if>
-              <option <#if parameters.labelLocaleName?exists && parameters.labelLocaleName == localeFound>selected="selected"</#if> value="${localeFound}" lang="${langAttr}" dir="${langDir}"><#if locale?exists && locale?has_content>${locale.getDisplayName(locale)}<#else>${localeFound}</#if></option>
+              <option <#if parameters.labelLocaleName?? && parameters.labelLocaleName == localeFound>selected="selected"</#if> value="${localeFound}" lang="${langAttr}" dir="${langDir}"><#if locale?? && locale?has_content>${locale.getDisplayName(locale)}<#else>${localeFound}</#if></option>
             </#list>
           </select>
         </td>
@@ -77,13 +77,13 @@
           ${uiLabelMap.WebtoolsLabelManagerOnlyNotUsedLabels}
         </td>
         <td>
-          <input type="checkbox" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?exists && parameters.onlyNotUsedLabels == "Y">checked="checked"</#if> />
+          <input type="checkbox" name="onlyNotUsedLabels" value="Y" <#if parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y">checked="checked"</#if> />
         </td>
         <td class="label">
           ${uiLabelMap.WebtoolsLabelManagerOnlyMissingTranslations}
         </td>
         <td>
-          <input type="checkbox" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations == "Y">checked="checked"</#if> />
+          <input type="checkbox" name="onlyMissingTranslations" value="Y" <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y">checked="checked"</#if> />
         </td>
       </tr>
       <tr>
Index: framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl
===================================================================
--- framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl	(working copy)
@@ -31,7 +31,7 @@
             <tr>
                 <td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td>
                 <td>
-                    <#if parameters.sourceKey?exists>
+                    <#if parameters.sourceKey??>
                         ${parameters.sourceKey}
                         <input type="hidden" name="key" value="${parameters.sourceKey}" />
                         <input type="hidden" name="update_label" value="Y" />
@@ -44,20 +44,20 @@
             <tr>
                 <td class="label">${uiLabelMap.WebtoolsLabelManagerKeyComment}</td>
                 <td>
-                    <input type="text" name="keyComment" size="70" value="${parameters.sourceKeyComment?if_exists}" />
+                    <input type="text" name="keyComment" size="70" value="${parameters.sourceKeyComment!}" />
                 </td>
             </tr>
             <tr>
                 <td class="label">${uiLabelMap.WebtoolsLabelManagerFileName}</td>
                 <td>
-                    <#if parameters.sourceFileName?exists>
+                    <#if parameters.sourceFileName??>
                         ${parameters.sourceFileName}
                         <input type="hidden" name="fileName" value="${parameters.sourceFileName}" />
                     <#else>
                         <select name="fileName">
                             <#list filesFound as fileInfo>
                               <#assign fileName = fileInfo.file.getName()/>
-                              <option <#if parameters.fileName?exists && parameters.fileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option>
+                              <option <#if parameters.fileName?? && parameters.fileName == fileName>selected="selected"</#if> value="${fileName}">${fileName}</option>
                             </#list>
                         </select>
                     </#if>
@@ -66,7 +66,7 @@
             <tr>
                 <td colspan="2" align="center">
                     <input type="submit" value="${uiLabelMap.CommonBack}"/>
-                    <#if parameters.sourceKey?exists>
+                    <#if parameters.sourceKey??>
                         <input type="submit" value="${uiLabelMap.WebtoolsLabelManagerRemove}" name="removeLabel"/>
                         <input type="submit" value="${uiLabelMap.CommonUpdate}" name="confirm" onclick="javascript:updateAndSaveLabel()"/>
                     <#else>
@@ -78,21 +78,21 @@
             <#list localesFound as localeFound>
                 <#assign labelValue = "">
                 <#assign labelComment = "">
-                <#if parameters.sourceKey?exists>
-                    <#assign value = (label.getLabelValue(localeFound))?if_exists>
+                <#if parameters.sourceKey??>
+                    <#assign value = (label.getLabelValue(localeFound))!>
                     <#if value?has_content>
                         <#assign labelValue = value.getLabelValue()>
                         <#assign labelComment = value.getLabelComment()>
                     </#if>
                 </#if>
                 <#assign showLocale = true>
-                <#if parameters.labelLocaleName?exists && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
+                <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
                     <#assign showLocale = false>
                 </#if>
                 <#if showLocale == true>
                     <tr>
-                        <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)?if_exists/>
-                        <#if locale?exists && locale?has_content>
+                        <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/>
+                        <#if locale?? && locale?has_content>
                             <#assign langAttr = localeFound.toString()?replace("_", "-")>
                             <#assign langDir = "ltr">
                             <#if "ar.iw"?contains(langAttr?substring(0, 2))>
@@ -106,8 +106,8 @@
                         </#if>
                         <td>
                             <input type="hidden" name="localeNames" value="${localeFound}" />
-                            <input type="text" name="localeValues" size="70" value="${labelValue?if_exists}" />
-                            <input type="text" name="localeComments" size="70" value="${labelComment?if_exists}" />
+                            <input type="text" name="localeValues" size="70" value="${labelValue!}" />
+                            <input type="text" name="localeComments" size="70" value="${labelComment!}" />
                         </td>
                     </tr>
                 </#if>
@@ -115,7 +115,7 @@
             <tr>
                 <td colspan="2" align="center">
                     <input type="submit" value="${uiLabelMap.CommonBack}"/>
-                    <#if parameters.sourceKey?exists>
+                    <#if parameters.sourceKey??>
                         <input type="submit" value="${uiLabelMap.WebtoolsLabelManagerRemove}" name="removeLabel"/>
                         <input type="submit" value="${uiLabelMap.CommonUpdate}" name="confirm" onclick="javascript:updateAndSaveLabel()"/>
                     <#else>
Index: framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl
===================================================================
--- framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl	(working copy)
@@ -20,11 +20,11 @@
     <table class="basic-table" cellspacing="3">
         <tr>
             <td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td>
-            <td>${parameters.sourceKey?if_exists}</td>
+            <td>${parameters.sourceKey!}</td>
         </tr>
         <tr>
             <td class="label">${uiLabelMap.WebtoolsLabelManagerFileName}</td>
-            <td>${parameters.fileName?if_exists}</td>
+            <td>${parameters.fileName!}</td>
         </tr>
         <tr>
             <td colspan="2">&nbsp;</td>
Index: framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl
===================================================================
--- framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl	(working copy)
@@ -17,7 +17,7 @@
 under the License.
 -->
 <div class="screenlet-body">
-  <#if parameters.searchLabels?exists>
+  <#if parameters.searchLabels??>
   <table class="basic-table hover-bar" cellspacing="3">
     <tr class="header-row">
       <td>${uiLabelMap.WebtoolsLabelManagerRow}</td>
Index: framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
===================================================================
--- framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl	(working copy)
@@ -25,12 +25,12 @@
       <td>${uiLabelMap.WebtoolsLabelManagerReferences}</td>
       <#list localesFound as localeFound>
         <#assign showLocale = true>
-        <#if parameters.labelLocaleName?exists && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
+        <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
           <#assign showLocale = false>
         </#if>
         <#if showLocale == true>
-          <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)?if_exists/>
-          <#if locale?exists && locale?has_content>
+          <#assign locale = Static["org.ofbiz.base.util.UtilMisc"].parseLocale(localeFound)!/>
+          <#if locale?? && locale?has_content>
             <#assign langAttr = localeFound.toString()?replace("_", "-")>
             <#assign langDir = "ltr">
             <#if "ar.iw"?contains(langAttr?substring(0, 2))>
@@ -45,7 +45,7 @@
         </#if>
       </#list>
     </tr>
-    <#if parameters.searchLabels?exists>
+    <#if parameters.searchLabels??>
       <#assign rowNum = "2">
       <#assign rowNumber = 1>
       <#assign totalLabels = 0>
@@ -56,43 +56,43 @@
         <#assign label = labels.get(labelList)>
         <#assign labelKey = label.labelKey>
         <#assign totalLabels = totalLabels + 1>
-        <#if references?exists>
+        <#if references??>
           <#assign referenceNum = 0>
-          <#assign reference = references.get(labelKey)?if_exists>
-          <#if reference?exists && reference?has_content>
+          <#assign reference = references.get(labelKey)!>
+          <#if reference?? && reference?has_content>
             <#assign referenceNum = reference.size()>
           </#if>
         </#if>
         <#assign showLabel = true>
-        <#if parameters.onlyMissingTranslations?exists && parameters.onlyMissingTranslations == "Y" 
-            && parameters.labelLocaleName?exists && parameters.labelLocaleName != "">
-          <#assign labelValue = label.getLabelValue(parameters.labelLocaleName)?if_exists>
-          <#if labelValue?exists && labelValue?has_content>
-            <#assign value = labelValue.getLabelValue()?if_exists>
-            <#if value?exists && value?has_content>
+        <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y" 
+            && parameters.labelLocaleName?? && parameters.labelLocaleName != "">
+          <#assign labelValue = label.getLabelValue(parameters.labelLocaleName)!>
+          <#if labelValue?? && labelValue?has_content>
+            <#assign value = labelValue.getLabelValue()!>
+            <#if value?? && value?has_content>
               <#assign showLabel = false>
             </#if>
           </#if>
         </#if>
-        <#if showLabel && parameters.onlyNotUsedLabels?exists && parameters.onlyNotUsedLabels == "Y" && (referenceNum > 0)>
+        <#if showLabel && parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y" && (referenceNum > 0)>
             <#assign showLabel = false>
         </#if>
-        <#if showLabel && parameters.labelKey?exists && parameters.labelKey != "" && parameters.labelKey != label.labelKey>
+        <#if showLabel && parameters.labelKey?? && parameters.labelKey != "" && parameters.labelKey != label.labelKey>
           <#assign showLabel = false>
         </#if>
-        <#if showLabel && parameters.labelFileName?exists && parameters.labelFileName != "" && parameters.labelFileName != label.fileName>
+        <#if showLabel && parameters.labelFileName?? && parameters.labelFileName != "" && parameters.labelFileName != label.fileName>
           <#assign showLabel = false>
         </#if>
         <#if showLabel == true>
           <tr <#if rowNum == "1">class="alternate-row"</#if>>
             <td>${rowNumber}</td>
-            <td><a href="<@ofbizUrl>UpdateLabel?sourceKey=${labelKey}&amp;sourceFileName=${label.fileName}&amp;sourceKeyComment=${label.labelKeyComment?if_exists}</@ofbizUrl>" <#if previousKey == labelKey>class="submenutext"</#if>>${label.labelKey}</a></td>
+            <td><a href="<@ofbizUrl>UpdateLabel?sourceKey=${labelKey}&amp;sourceFileName=${label.fileName}&amp;sourceKeyComment=${label.labelKeyComment!}</@ofbizUrl>" <#if previousKey == labelKey>class="submenutext"</#if>>${label.labelKey}</a></td>
             <td>${label.fileName}</td>
             <td><a href="<@ofbizUrl>ViewReferences?sourceKey=${labelKey}&amp;labelFileName=${label.fileName}</@ofbizUrl>">${uiLabelMap.WebtoolsLabelManagerReferences}</a></td>
             <#list localesFound as localeFound>
-              <#assign labelVal = label.getLabelValue(localeFound)?if_exists>
+              <#assign labelVal = label.getLabelValue(localeFound)!>
               <#assign showLocale = true>
-              <#if parameters.labelLocaleName?exists && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
+              <#if parameters.labelLocaleName?? && parameters.labelLocaleName != "" && parameters.labelLocaleName != localeFound>
                 <#assign showLocale = false>
               </#if>
               <#if showLocale>
Index: framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl
===================================================================
--- framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl	(working copy)
@@ -20,7 +20,7 @@
         <table class="basic-table" cellspacing="0">
             <tr>
                 <td class="label">${uiLabelMap.WebtoolsLabelManagerKey}</td>
-                <td colspan="2">${parameters.sourceKey?if_exists}</td>
+                <td colspan="2">${parameters.sourceKey!}</td>
             </tr>
             <tr>
                 <td colspan="3">&nbsp;</td>
@@ -30,17 +30,17 @@
                 <td>${uiLabelMap.WebtoolsLabelManagerFileName}</td>
                 <td>${uiLabelMap.WebtoolsLabelManagerReferences}</td>
             </tr>
-            <#if parameters.sourceKey?exists && parameters.sourceKey?has_content>
+            <#if parameters.sourceKey?? && parameters.sourceKey?has_content>
               <#assign rowNum = "2">
               <#assign rowNumber = 1>
               <#assign totalRefs = 0/>
-              <#assign reference = references.get(parameters.sourceKey)?if_exists>
-              <#if reference?exists &&  reference?has_content>
+              <#assign reference = references.get(parameters.sourceKey)!>
+              <#if reference?? &&  reference?has_content>
                 <#assign entries = reference.entrySet()>
                 <#list entries as entry>
                   <tr <#if rowNum == "1">class="alternate-row"</#if>>
                     <td>${rowNumber}</td>
-                    <td><a href="<@ofbizUrl>ViewFile?fileName=${entry.getKey()}&amp;sourceKey=${parameters.sourceKey?if_exists}</@ofbizUrl>">${entry.getKey()}</a></td>
+                    <td><a href="<@ofbizUrl>ViewFile?fileName=${entry.getKey()}&amp;sourceKey=${parameters.sourceKey!}</@ofbizUrl>">${entry.getKey()}</a></td>
                     <td>${entry.getValue()}</td>
                   </tr>
                   <#assign totalRefs = totalRefs + entry.getValue()/>
Index: framework/webtools/webapp/webtools/service/availableservices.ftl
===================================================================
--- framework/webtools/webapp/webtools/service/availableservices.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/service/availableservices.ftl	(working copy)
@@ -23,8 +23,8 @@
 <#assign popupUrl='serviceEcaDetail'>
 
 <#-- Selected Service is available -->
-<#if selectedServiceMap?exists>
-  <#if showWsdl?exists && showWsdl = true>
+<#if selectedServiceMap??>
+  <#if showWsdl?? && showWsdl = true>
     <div class="screenlet">
       <div class="screenlet-title-bar">
         <h3>${uiLabelMap.WebtoolsServiceWSDL} - ${uiLabelMap.WebtoolsService} ${selectedServiceMap.serviceName}</h3>
@@ -134,7 +134,7 @@
     </div>
 
     <#-- If service has ECA's -->
-    <#if ecaMapList?exists && ecaMapList?has_content>
+    <#if ecaMapList?? && ecaMapList?has_content>
       <#-- add the javascript for modalpopup's -->
       <script language='javascript' type='text/javascript'>
           function detailsPopup(viewName){
@@ -152,10 +152,10 @@
         <table class="basic-table" cellspacing='0'>
           <tr class="header-row">
             <td>${uiLabelMap.WebtoolsEventName}</td>
-            <#if ecaMapList.runOnError?exists>
+            <#if ecaMapList.runOnError??>
               <td>${uiLabelMap.WebtoolsRunOnError}</td>
             </#if>
-            <#if ecaMapList.runOnFailure?exists>
+            <#if ecaMapList.runOnFailure??>
               <td>${uiLabelMap.WebtoolsRunOnFailure}</td>
             </#if>
             <td>${uiLabelMap.WebtoolsActions}</td>
@@ -164,11 +164,11 @@
           </tr>
           <#list ecaMapList as ecaMap>
             <tr>
-              <td>${ecaMap.eventName?if_exists}</td>
-              <#if ecaMap.runOnError?exists>
+              <td>${ecaMap.eventName!}</td>
+              <#if ecaMap.runOnError??>
                 <td>${ecaMap.runOnError}</div></td>
               </#if>
-              <#if ecaMap.runOnFailure?exists>
+              <#if ecaMap.runOnFailure??>
                 <td>${ecaMap.runOnFailure}</div></td>
               </#if>
               <#if ecaMap.actions?has_content>
@@ -271,7 +271,7 @@
     </#if>
     <#-- End if service has ECA's -->
 
-    <#list selectedServiceMap.allParamsList?if_exists as paramList>
+    <#list selectedServiceMap.allParamsList! as paramList>
       <style type="text/css">
         .param-table tr td {
           width: 12.5%;
@@ -282,7 +282,7 @@
         <div class="screenlet-title-bar">
           <h3>${paramList.title}</h3>
         </div>
-        <#if paramList.paramList?exists && paramList.paramList?has_content>
+        <#if paramList.paramList?? && paramList.paramList?has_content>
           <table class="basic-table param-table" cellspacing='0'>
               <tr class="header-row">
                 <td>${uiLabelMap.WebtoolsParameterName}</td>
@@ -297,19 +297,19 @@
               </tr>
               <#list paramList.paramList as modelParam>
                 <tr>
-                  <td>${modelParam.name?if_exists}</td>
-                  <td>${modelParam.description?if_exists}</td>
-                  <td>${modelParam.optional?if_exists}</td>
-                  <td>${modelParam.type?if_exists}</td>
-                  <#-- <td>[${modelParam.defaultValue?if_exists}]</td> -->
-                  <td>${modelParam.mode?if_exists}</td>
-                  <td>${modelParam.internal?if_exists}</td>
+                  <td>${modelParam.name!}</td>
+                  <td>${modelParam.description!}</td>
+                  <td>${modelParam.optional!}</td>
+                  <td>${modelParam.type!}</td>
+                  <#-- <td>[${modelParam.defaultValue!}]</td> -->
+                  <td>${modelParam.mode!}</td>
+                  <td>${modelParam.internal!}</td>
                   <td>
-                    <#if modelParam.entityName?exists>
-                      <a href='<@ofbizUrl>${url}?constraint=default_entity_name@${modelParam.entityName}</@ofbizUrl>'>${modelParam.entityName?if_exists}</a>
+                    <#if modelParam.entityName??>
+                      <a href='<@ofbizUrl>${url}?constraint=default_entity_name@${modelParam.entityName}</@ofbizUrl>'>${modelParam.entityName!}</a>
                     </#if>
                   </td>
-                  <td>${modelParam.fieldName?if_exists}</td>
+                  <td>${modelParam.fieldName!}</td>
                 </tr>
               </#list>
           </table>
@@ -326,16 +326,16 @@
       <form name="exportServiceEoModelBundle" method="post" action="<@ofbizUrl>exportServiceEoModelBundle</@ofbizUrl>" class="basic-form">
         <input type="hidden" name="sel_service_name" value="${selectedServiceMap.serviceName}"/>
         <input type="hidden" name="serviceName" value="${selectedServiceMap.serviceName}"/>
-        Save eomodeld to Local Path: <input type="text" name="eomodeldFullPath" value="${parameters.eomodeldFullPath?if_exists}" size="60"/>
+        Save eomodeld to Local Path: <input type="text" name="eomodeldFullPath" value="${parameters.eomodeldFullPath!}" size="60"/>
         <input type="submit" name="submitButton" value="Export"/>
       </form>
     </div>
   </#if>
 <#-- No Service selected , we list all-->
-<#elseif servicesList?exists && servicesList?has_content>
+<#elseif servicesList?? && servicesList?has_content>
 
   <#-- Show alphabetical index -->
-  <#if serviceNamesAlphaList?exists && serviceNamesAlphaList?has_content>
+  <#if serviceNamesAlphaList?? && serviceNamesAlphaList?has_content>
     <form id='dispForm' method='post' action='<@ofbizUrl>${url}</@ofbizUrl>'>
       <div class="button-bar">
         <#assign isfirst=true>
@@ -343,7 +343,7 @@
           <a href='<@ofbizUrl>${url}?constraint=alpha@${alpha}</@ofbizUrl>'>${alpha}</a>
           <#assign isfirst=false>
         </#list>
-        <#if dispArrList?exists && dispArrList?has_content>
+        <#if dispArrList?? && dispArrList?has_content>
           &nbsp;&nbsp;&nbsp;&nbsp;
           <script language='javascript' type='text/javascript'>
             function submitDispForm(){
Index: framework/webtools/webapp/webtools/service/serviceResult.ftl
===================================================================
--- framework/webtools/webapp/webtools/service/serviceResult.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/service/serviceResult.ftl	(working copy)
@@ -31,12 +31,12 @@
           <#list serviceResultList as srl>
             <tr>
               <#if srl.hasChild=="Y">
-                <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}">${srl.key?if_exists}</a></td>
+                <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath??>${parameters.servicePath}||</#if>${srl.key!}">${srl.key!}</a></td>
               <#else>
-                <td>${srl.key?if_exists}</td>
+                <td>${srl.key!}</td>
               </#if>
-              <td>${srl.value?if_exists}</td>
-              <td><input type="checkbox" name="<#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}" /></td>
+              <td>${srl.value!}</td>
+              <td><input type="checkbox" name="<#if parameters.servicePath??>${parameters.servicePath}||</#if>${srl.key!}" /></td>
             </tr>
           </#list>
           <tr>
Index: framework/webtools/webapp/webtools/service/setServiceParameter.ftl
===================================================================
--- framework/webtools/webapp/webtools/service/setServiceParameter.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/service/setServiceParameter.ftl	(working copy)
@@ -27,7 +27,7 @@
       <tr>
         <td class="label">${serviceParameter.name} (${serviceParameter.type})</td>
         <td>
-          <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value?if_exists}" <#if serviceParameter.optional == "N">class="required"</#if>/>
+          <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value!}" <#if serviceParameter.optional == "N">class="required"</#if>/>
           <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
           <#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue}</#if>
         </td>
Index: framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
===================================================================
--- framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl	(working copy)
@@ -27,7 +27,7 @@
       <tr>
         <td class="label">${serviceParameter.name} (${serviceParameter.type})</td>
         <td>
-          <input type="text" size="20" name="${serviceParameter.name}" value="<#if serviceParameter.value?if_exists>${serviceParameter.value?string}</#if>"<#if serviceParameter.optional == "N"> class="required"</#if>/>
+          <input type="text" size="20" name="${serviceParameter.name}" value="<#if serviceParameter.value!>${serviceParameter.value?string}</#if>"<#if serviceParameter.optional == "N"> class="required"</#if>/>
           <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
           <#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue?string}</#if>
         </td>
Index: framework/webtools/webapp/webtools/service/threads.ftl
===================================================================
--- framework/webtools/webapp/webtools/service/threads.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/service/threads.ftl	(working copy)
@@ -31,19 +31,19 @@
       </tr>
       <#assign alt_row = false>
       <#list allThreadList as javaThread>
-      <#if javaThread?exists>
+      <#if javaThread??>
         <#assign stackTraceArray = javaThread.getStackTrace()/>
         <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-          <td valign="top">${(javaThread.getThreadGroup().getName())?if_exists}</td>
+          <td valign="top">${(javaThread.getThreadGroup().getName())!}</td>
           <td valign="top">${javaThread.getId()?string}</td>
           <td valign="top">
-            <b>${javaThread.getName()?if_exists}</b>
+            <b>${javaThread.getName()!}</b>
             <#list 1..maxElements as stackIdx>
-              <#assign stackElement = stackTraceArray[stackIdx]?if_exists/>
+              <#assign stackElement = stackTraceArray[stackIdx]!/>
               <#if (stackElement.toString())?has_content><div>${stackElement.toString()}</div></#if>
             </#list>
           </td>
-          <td valign="top">${javaThread.getState().name()?if_exists}&nbsp;</td>
+          <td valign="top">${javaThread.getState().name()!}&nbsp;</td>
           <td valign="top">${javaThread.getPriority()}</td>
           <td valign="top">${javaThread.isDaemon()?string}<#-- /${javaThread.isAlive()?string}/${javaThread.isInterrupted()?string} --></td>
         </tr>
Index: framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
===================================================================
--- framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl	(revision 1590602)
+++ framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl	(working copy)
@@ -37,12 +37,12 @@
   <#if !"INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)>
     <tr>
       <td class="label">${uiLabelMap.CommonDescription}</td>
-      <td><input type="text" name="description" value="${temporalExpression.description?if_exists}" maxlength="60" size="20"/></td>
+      <td><input type="text" name="description" value="${temporalExpression.description!}" maxlength="60" size="20"/></td>
     </tr>
   <#else>
     <tr>
       <td class="label">${uiLabelMap.CommonDescription}</td>
-      <td>${temporalExpression.get("description",locale)?if_exists}</td>
+      <td>${temporalExpression.get("description",locale)!}</td>
     </tr>
   </#if>
     <#if temporalExpression.tempExprTypeId == "DATE_RANGE">
Index: framework/widget/templates/csvFormMacroLibrary.ftl
===================================================================
--- framework/widget/templates/csvFormMacroLibrary.ftl	(revision 1590602)
+++ framework/widget/templates/csvFormMacroLibrary.ftl	(working copy)
@@ -17,7 +17,7 @@
 under the License.
 -->
 
-<#macro renderField text><#if text?exists>"${text?replace("\"", "\"\"")}"</#if></#macro>
+<#macro renderField text><#if text??>"${text?replace("\"", "\"\"")}"</#if></#macro>
 
 <#macro renderDisplayField type imageLocation idName description title class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
 <@renderField description />,<#rt/>
Index: framework/widget/templates/csvScreenMacroLibrary.ftl
===================================================================
--- framework/widget/templates/csvScreenMacroLibrary.ftl	(revision 1590602)
+++ framework/widget/templates/csvScreenMacroLibrary.ftl	(working copy)
@@ -40,7 +40,7 @@
 
 <#macro renderHorizontalSeparator id style></#macro>
 <#macro renderLabel text id style>
-    <#if text?exists>
+    <#if text??>
         ${text}<#lt/>
     </#if>
 </#macro>
Index: framework/widget/templates/foFormMacroLibrary.ftl
===================================================================
--- framework/widget/templates/foFormMacroLibrary.ftl	(revision 1590602)
+++ framework/widget/templates/foFormMacroLibrary.ftl	(working copy)
@@ -39,9 +39,9 @@
 
 <#escape x as x?xml>
 
-<#macro makeBlock style text><fo:block<#if style?has_content> <@getFoStyle style/></#if>><#if text?exists>${text}</#if></fo:block></#macro>
+<#macro makeBlock style text><fo:block<#if style?has_content> <@getFoStyle style/></#if>><#if text??>${text}</#if></fo:block></#macro>
 
-<#macro renderField text><#if text?exists>${text}</#if></#macro>
+<#macro renderField text><#if text??>${text}</#if></#macro>
 
 <#macro renderDisplayField type imageLocation idName description title class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
 <@makeBlock class description />
Index: framework/widget/templates/htmlFormMacroLibrary.ftl
===================================================================
--- framework/widget/templates/htmlFormMacroLibrary.ftl	(revision 1590602)
+++ framework/widget/templates/htmlFormMacroLibrary.ftl	(working copy)
@@ -18,7 +18,7 @@
 -->
 
 <#macro renderField text>
-  <#if text?exists>
+  <#if text??>
     ${text}<#lt/>
   </#if>
 </#macro>
@@ -125,34 +125,34 @@
         if (Date.CultureInfo != undefined) {
           var initDate = <#if value?has_content>jQuery("#${id}_i18n").val()<#else>""</#if>;
           if (initDate != "") {
-            var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
+            var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
             <#-- bad hack because the JS date parser doesn't understand dots in the date / time string -->
             if (initDate.indexOf('.') != -1) {
               initDate = initDate.substring(0, initDate.indexOf('.'));
             }
-            var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
+            var ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
             var dateObj = Date.parseExact(initDate, ofbizTime);
             var formatedObj = dateObj.toString(dateFormat);
             jQuery("#${id}_i18n").val(formatedObj);
           }
 
           jQuery("#${id}").change(function() {
-            var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
+            var ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
             var newValue = ""
             if (this.value != "") {
               var dateObj = Date.parseExact(this.value, ofbizTime);
-              var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
+              var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
               newValue = dateObj.toString(dateFormat);
             }
             jQuery("#${id}_i18n").val(newValue);
           });
           jQuery("#${id}_i18n").change(function() {
-            var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>,
+            var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>,
             newValue = "",
             dateObj = Date.parseExact(this.value, dateFormat),
             ofbizTime;
             if (this.value != "" && dateObj !== null) {
-              ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
+              ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
               newValue = dateObj.toString(ofbizTime);
             }
             else { // invalid input
@@ -170,7 +170,7 @@
         });
       }
 
-      <#if shortDateInput?exists && shortDateInput>
+      <#if shortDateInput?? && shortDateInput>
         jQuery("#${id}").datepicker({
       <#else>
         jQuery("#${id}").datetimepicker({
@@ -296,7 +296,7 @@
     <#if confirmation?has_content>onclick="return confirm('${confirmation?js_string}');"</#if>/>
   <#else>
     <input type="<#if containerId?has_content>button<#else>submit</#if>" <@renderClass className alert />
-    <#if name?exists> name="${name}"</#if><#if title?has_content> value="${title}"</#if><#if event?has_content> ${event}="${action}"</#if>
+    <#if name??> name="${name}"</#if><#if title?has_content> value="${title}"</#if><#if event?has_content> ${event}="${action}"</#if>
     <#if containerId?has_content> onclick="<#if confirmation?has_content>if (confirm('${confirmation?js_string}')) </#if>ajaxSubmitFormUpdateAreas('${containerId}', '${ajaxUrl}')"
       <#else><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}');"</#if>
     </#if>/>
@@ -517,7 +517,7 @@
       </span><#rt/>
     </#if>
     <#rt/>
-    <input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle?exists> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
+    <input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle??> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
     <#if dateType != "time">
       <script type="text/javascript">
         <#if dateType == "date">
Index: framework/widget/templates/htmlScreenMacroLibrary.ftl
===================================================================
--- framework/widget/templates/htmlScreenMacroLibrary.ftl	(revision 1590602)
+++ framework/widget/templates/htmlScreenMacroLibrary.ftl	(working copy)
@@ -46,17 +46,17 @@
 <#macro renderContentBegin editRequest enableEditValue editContainerStyle><#if editRequest?has_content && enableEditValue == "true"><div class=${editContainerStyle}></#if></#macro>
 <#macro renderContentBody></#macro>
 <#macro renderContentEnd urlString editMode editContainerStyle editRequest enableEditValue>
-<#if editRequest?exists && enableEditValue == "true">
-<#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if>
-<#if editContainerStyle?exists></div><#rt/></#if>
+<#if editRequest?? && enableEditValue == "true">
+<#if urlString??><a href="${urlString}">${editMode}</a><#rt/></#if>
+<#if editContainerStyle??></div><#rt/></#if>
 </#if>
 </#macro>
-<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?exists && enableEditValue == "true"><div class="${editContainerStyle}"></#if></#macro>
+<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?? && enableEditValue == "true"><div class="${editContainerStyle}"></#if></#macro>
 <#macro renderSubContentBody></#macro>
 <#macro renderSubContentEnd urlString editMode editContainerStyle editRequest enableEditValue>
-<#if editRequest?exists && enableEditValue == "true">
-<#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if>
-<#if editContainerStyle?exists></div><#rt/></#if>
+<#if editRequest?? && enableEditValue == "true">
+<#if urlString??><a href="${urlString}">${editMode}</a><#rt/></#if>
+<#if editContainerStyle??></div><#rt/></#if>
 </#if>
 </#macro>
 
Index: framework/widget/templates/textFormMacroLibrary.ftl
===================================================================
--- framework/widget/templates/textFormMacroLibrary.ftl	(revision 1590602)
+++ framework/widget/templates/textFormMacroLibrary.ftl	(working copy)
@@ -17,7 +17,7 @@
 under the License.
 -->
 
-<#macro renderField text><#if text?exists>"${text}"</#if></#macro>
+<#macro renderField text><#if text??>"${text}"</#if></#macro>
 
 <#macro renderDisplayField type imageLocation idName description class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
 <@renderField description />
Index: framework/widget/templates/textScreenMacroLibrary.ftl
===================================================================
--- framework/widget/templates/textScreenMacroLibrary.ftl	(revision 1590602)
+++ framework/widget/templates/textScreenMacroLibrary.ftl	(working copy)
@@ -40,7 +40,7 @@
 
 <#macro renderHorizontalSeparator id style></#macro>
 <#macro renderLabel text id style>
-    <#if text?exists>
+    <#if text??>
         ${text}<#lt/>
     </#if>
 </#macro>
Index: framework/widget/templates/xmlFormMacroLibrary.ftl
===================================================================
--- framework/widget/templates/xmlFormMacroLibrary.ftl	(revision 1590602)
+++ framework/widget/templates/xmlFormMacroLibrary.ftl	(working copy)
@@ -17,7 +17,7 @@
 under the License.
 -->
 
-<#macro renderField text><#if text?exists>${text?xml}</#if></#macro>
+<#macro renderField text><#if text??>${text?xml}</#if></#macro>
 
 <#macro renderFormatListWrapperOpen formName style columnStyles><${formName}Export></#macro>